No need for ifdef, can now use GTK_IS_PLUG() with all backends.

2005-07-21  Tor Lillqvist  <tml@novell.com>

	* gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now
	use GTK_IS_PLUG() with all backends.

diff --git a/ChangeLog b/ChangeLog
index f8f27a504f982bf26253f5e7c6d85d835d27a019..a4ae967a79f36b12f47de920ec2ce2fb054d0212 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
 2005-07-21  Tor Lillqvist  <tml@novell.com>
 
-       * gtk/gtk.symbols: Make GtkPlug/Socket API available on all platforms.
+       * gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now
+       use GTK_IS_PLUG() with all backends.
 
-       * gtk/Makefile.am: Changes to build GtkPlug/Socket on all platforms.
+       * gtk/gtk.symbols: Make GtkPlug/Socket API available with all
+       backends.
+
+       * gtk/Makefile.am: Changes to build GtkPlug/Socket with all
+       backends.
 
        * gtk/gtksocket.c
        * gtk/gtkplug.c: Splice out backend-dependend parts to separate

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f8f27a504f982bf26253f5e7c6d85d835d27a019..a4ae967a79f36b12f47de920ec2ce2fb054d0212 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,8 +1,13 @@
 2005-07-21  Tor Lillqvist  <tml@novell.com>
 
-       * gtk/gtk.symbols: Make GtkPlug/Socket API available on all platforms.
+       * gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now
+       use GTK_IS_PLUG() with all backends.
 
-       * gtk/Makefile.am: Changes to build GtkPlug/Socket on all platforms.
+       * gtk/gtk.symbols: Make GtkPlug/Socket API available with all
+       backends.
+
+       * gtk/Makefile.am: Changes to build GtkPlug/Socket with all
+       backends.
 
        * gtk/gtksocket.c
        * gtk/gtkplug.c: Splice out backend-dependend parts to separate

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f8f27a504f982bf26253f5e7c6d85d835d27a019..a4ae967a79f36b12f47de920ec2ce2fb054d0212 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,8 +1,13 @@
 2005-07-21  Tor Lillqvist  <tml@novell.com>
 
-       * gtk/gtk.symbols: Make GtkPlug/Socket API available on all platforms.
+       * gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now
+       use GTK_IS_PLUG() with all backends.
 
-       * gtk/Makefile.am: Changes to build GtkPlug/Socket on all platforms.
+       * gtk/gtk.symbols: Make GtkPlug/Socket API available with all
+       backends.
+
+       * gtk/Makefile.am: Changes to build GtkPlug/Socket with all
+       backends.
 
        * gtk/gtksocket.c
        * gtk/gtkplug.c: Splice out backend-dependend parts to separate

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 8f0365c2ddea21f9da8c9a3ef04e935e0a230bba..7d0da98eaf5a4dbd297bdceee93aaea9f2ecb181 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -30,6 +30,8 @@
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
 
+#include "gtkintl.h"
+
 #include "gtkprivate.h"
 #include "gtkrc.h"
 #include "gtkwindow.h"
@@ -40,7 +42,6 @@
 #include "gtkmnemonichash.h"
 #include "gtkiconfactory.h"
 #include "gtkicontheme.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkplug.h"
 #include "gtkalias.h"
@@ -3935,11 +3936,7 @@ gtk_window_show (GtkWidget *widget)
 
   /* Try to make sure that we have some focused widget
    */
-#ifdef GDK_WINDOWING_X11
   if (!window->focus_widget && !GTK_IS_PLUG (window))
-#else
-  if (!window->focus_widget)
-#endif
     gtk_window_move_focus (window, GTK_DIR_TAB_FORWARD);
   
   if (window->modal)